Fix x86_64 guest console support.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 8a3b289131c72e11ac942e8dc9d8b71042aa943a..eaa32d820677898f1fd122b86f4a0acfc9c98732 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -951,22 +951,20 @@ void __init setup_arch(char **cmdline_p)
                       
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
-              conswitchp = &vga_con;
+                      conswitchp = &vga_con;
 #elif defined(CONFIG_DUMMY_CONSOLE)
-              conswitchp = &dummy_con;
+                      conswitchp = &dummy_con;
 #endif
 #endif
               } else {
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
                       extern const struct consw xennull_con;
                       extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)
-               /* disable VGA driver */
+                      /* disable VGA driver */
                       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
 #endif
                       conswitchp = &xennull_con;
                       console_use_vt = 0;
-#endif
               }
        }
 #else  /* CONFIG_XEN */